- Fix parallel (-jX) builds, remove jobs unsafe mark

- Drop article from COMMENT, expand creator's name
This commit is contained in:
Alexey Dokuchaev 2013-07-31 04:37:25 +00:00
parent 2b825c8683
commit 012ea9678a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=324001
2 changed files with 39 additions and 3 deletions

View file

@ -1,4 +1,4 @@
# Created by: swallace
# Created by: Steven Wallace <swallace@FreeBSD.org>
# $FreeBSD$
PORTNAME= xpaint
@ -8,7 +8,7 @@ CATEGORIES= graphics
MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= johans@FreeBSD.org
COMMENT= A simple paint program
COMMENT= Simple paint program
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
@ -25,7 +25,6 @@ USE_XORG= xft xmu xpm
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GHOSTSCRIPT_RUN=yes
MAKE_JOBS_UNSAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib

View file

@ -0,0 +1,37 @@
--- Makefile.in.orig 2013-07-31 11:35:58.000000000 +0800
+++ Makefile.in 2013-07-31 11:40:10.000000000 +0800
@@ -1009,10 +1009,10 @@
echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
substads: substads.c
- $(CC) substads.c -o $@
+ $(CC) $(CFLAGS) substads.c -o $@
preproc: preproc.c
- $(CC) preproc.c -o $@
+ $(CC) $(CFLAGS) preproc.c -o $@
DefaultRC.txt.h: substads DefaultRC
./substads -ad2c DefaultRC $@
@@ -1020,10 +1020,8 @@
messages.h: preproc
./preproc > messages.h
-XPaint.ad: app-defaults
- $(CC) substads.c -o substads
- cd app-defaults ; \
- ../substads -appdefs \
+XPaint.ad: substads app-defaults
+ ./substads -appdefs \
XPAINT_VERSION $(PACKAGE_VERSION) \
XPAINT_SHAREDIR $(SHAREDIR) \
XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
@@ -1034,7 +1032,7 @@
XPaint.ad.h: substads XPaint.ad
./substads -ad2c XPaint.ad $@
-xpaint.1: xpaint.1.in version.h
+xpaint.1: substads xpaint.1.in version.h
./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION)
install-exec-hook: