aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2002-12-25 05:49:20 +0800
committerdinoex <dinoex@FreeBSD.org>2002-12-25 05:49:20 +0800
commit26035dafd378e594059ae46adef746b1187e7133 (patch)
tree6fbada82468c7ce25c526efb0c6649a5cc9a09fb
parent04add8815acabc1c524727540808910339ea3de9 (diff)
downloadfreebsd-ports-gnome-26035dafd378e594059ae46adef746b1187e7133.tar.gz
freebsd-ports-gnome-26035dafd378e594059ae46adef746b1187e7133.tar.zst
freebsd-ports-gnome-26035dafd378e594059ae46adef746b1187e7133.zip
- Fix build of old variant
-rw-r--r--x11-toolkits/gnustep-gui/Makefile5
-rw-r--r--x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c (renamed from x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c)0
2 files changed, 4 insertions, 1 deletions
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 1e9c7de94b1d..5afcd7b20aa8 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -33,6 +33,7 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile
BREAKS_IF_PEDANTIC= yes
.if defined(GNUSTEP_GUI_DEVEL)
+EXTRA_PATCHES= ${FILESDIR}/extra-pa_unix_oss.c
PLIST_SUB+= DEVEL=""
PLIST_SUB+= NODEVEL="@comment "
.else
@@ -52,7 +53,7 @@ CONFIGURE_TARGET=
USE_GMAKE= yes
MAKEFILE=
MAKE_FLAGS+= OPTFLAG="${CFLAGS}"
-MAKE_FLAGS+= ADDITIONAL_LIB_DIRS=/usr/local/lib to core/gui/Source/GNUmakefile.preamble
+MAKE_FLAGS+= ADDITIONAL_LIB_DIRS=/usr/local/lib
NO_MTREE= yes
CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include
@@ -75,11 +76,13 @@ post-extract:
@${CP} ${PREFIX}/System/Makefiles/${file} ${WRKSRC}
.endfor
+.if defined(GNUSTEP_GUI_DEVEL)
pre-configure:
@ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed
${SED} -e "s=-lphread=${PTHREAD_LIBS}=" -e "s;CFLAGS =;CFLAGS+=;" \
-e "s;-Wall;-Wall ${PTHREAD_CFLAGS:S=""==};" \
${EXTRA_FIX}.sed > ${EXTRA_FIX}
+.endif
do-configure:
@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c b/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c
index 4a88b41dee54..4a88b41dee54 100644
--- a/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c
+++ b/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c