diff options
-rw-r--r-- | deskutils/gworkspace/Makefile | 43 | ||||
-rw-r--r-- | deskutils/preferences.app/Makefile | 33 | ||||
-rw-r--r-- | games/gomoku.app/Makefile | 28 | ||||
-rw-r--r-- | games/gshisen/Makefile | 28 | ||||
-rw-r--r-- | lang/gnustep-base/Makefile | 60 | ||||
-rw-r--r-- | mail/gnumail/Makefile | 33 | ||||
-rw-r--r-- | mail/pantomime-ssl/Makefile | 27 | ||||
-rw-r--r-- | mail/pantomime/Makefile | 27 | ||||
-rw-r--r-- | misc/gnustep-examples/Makefile | 30 | ||||
-rw-r--r-- | shells/gscommander/Makefile | 27 | ||||
-rw-r--r-- | textproc/easydiff/Makefile | 27 | ||||
-rw-r--r-- | x11-toolkits/gnustep-gui/Makefile | 58 | ||||
-rw-r--r-- | x11-toolkits/gtoolkit/Makefile | 46 |
13 files changed, 94 insertions, 373 deletions
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile index 06ab82a15da0..29e8b365f5fc 100644 --- a/deskutils/gworkspace/Makefile +++ b/deskutils/gworkspace/Makefile @@ -14,19 +14,13 @@ MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ \ MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep workspace manager -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/${PORTNAME} GUN_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .ifdef WITHOUT_GHOSTSCRIPT PLIST_SUB+= PDFVIEW="@comment " @@ -38,35 +32,10 @@ PLIST_SUB+= PDFVIEW="" .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-configure: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL} -c" \ - INSTALL_PROGRAM="${INSTALL} -c" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ - ${CAT} ${CONFIGURE_LOG}; \ - ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ - ${FALSE}; \ - fi) - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile index 99ae57f0bfc9..927868477f97 100644 --- a/deskutils/preferences.app/Makefile +++ b/deskutils/preferences.app/Makefile @@ -16,46 +16,29 @@ DISTNAME= Preferences-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep workspace manager -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - USE_BZIP2= yes -INSTALLS_SHLIB= yes PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes -USE_GCC= 3.2 +INSTALLS_SHLIB= yes + MODIFY= GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \ Modules/Keyboard/GNUmakefile.preamble \ Modules/PrefsApp/GNUmakefile.preamble -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - post-patch: .for i in ${MODIFY} @${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed ${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i} .endfor -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +.include <bsd.port.pre.mk> -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/games/gomoku.app/Makefile b/games/gomoku.app/Makefile index 9e8e40412c13..386c75f19ba6 100644 --- a/games/gomoku.app/Makefile +++ b/games/gomoku.app/Makefile @@ -15,35 +15,17 @@ DISTNAME= Gomoku-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep Gomoku game -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes -USE_GCC= 3.2 - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile index c9ff76bfb837..5cbe379ad4b8 100644 --- a/games/gshisen/Makefile +++ b/games/gshisen/Makefile @@ -14,37 +14,19 @@ MASTER_SITES= http://www.imago.ro/gshisen/ MAINTAINER= dinoex@FreeBSD.org COMMENT= Mahjongg-kind of game that uses the GNUstep toolkit -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/GShisen USE_GMAKE= yes MAKEFILE= MAKE_FLAGS= GUI_BACKEND_LIB=back ALL_TARGET= -NO_MTREE= yes -USE_GCC= 3.2 - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index aba52aef4c0c..7d9aecb09f9e 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -17,22 +17,11 @@ MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep Foundation library -BUILD_DEPENDS= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -BUILD_DEPENDS+= ${SYSTEMDIR}/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 -RUN_DEPENDS+= ${SYSTEMDIR}/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make - -BREAKS_IF_PEDANTIC= yes -USE_GCC= 3.2 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 300000 -BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x" -.endif +LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 PREFIX= ${LOCALBASE}/GNUstep -PLIST_SUB+= LOCALBASE=${LOCALBASE} +NO_MTREE= yes +ETCDIR= ${LOCALBASE}/etc USE_AUTOCONF= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs @@ -40,47 +29,22 @@ CONFIGURE_TARGET= USE_GMAKE= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" -NO_MTREE= yes CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml +BREAKS_IF_PEDANTIC= yes +PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} +PLIST_SUB+= LOCALBASE=${LOCALBASE} -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \ - MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} -ETCDIR= ${LOCALBASE}/etc -SYSTEMDIR= ${PREFIX}/System -SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} +.include <bsd.port.pre.mk> + +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" post-extract: @${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" ${FILESDIR}/GNUstep.sh \ > ${WRKSRC}/GNUstep.sh -do-configure: - @(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL} -c" \ - INSTALL_PROGRAM="${INSTALL} -c" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ - ${CAT} ${CONFIGURE_LOG}; \ - ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ - ${FALSE}; \ - fi) - -do-build: - @(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) - post-install: -@${MKDIR} ${ETCDIR}/rc.d ${INSTALL_SCRIPT} ${FILESDIR}/GNUstep.sh ${ETCDIR}/rc.d diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile index 097f71dcf872..85d13dc87cf6 100644 --- a/mail/gnumail/Makefile +++ b/mail/gnumail/Makefile @@ -16,40 +16,23 @@ DISTNAME= GNUMail-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep mail client -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -BUILD_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -RUN_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime +BUILD_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/${PANTOMIME_PORT} +RUN_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/${PANTOMIME_PORT} PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/GNUMail USE_GMAKE= yes MAKEFILE= -MAKE_FLAGS+= GUI_BACKEND_LIB=back ALL_TARGET= -NO_MTREE= yes -USE_GCC= 3.2 - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu -LOCALLIBDIR= ${PREFIX}/Local/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +PANTOMIME_PORT?= mail/pantomime .include <bsd.port.post.mk> diff --git a/mail/pantomime-ssl/Makefile b/mail/pantomime-ssl/Makefile index cc9a4a74321d..a9070d0d16c9 100644 --- a/mail/pantomime-ssl/Makefile +++ b/mail/pantomime-ssl/Makefile @@ -17,36 +17,25 @@ DISTNAME= Pantomime-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= SSL Connections for pantomime -BUILD_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime -RUN_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime +BUILD_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/${PANTOMIME_PORT} +RUN_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/${PANTOMIME_PORT} PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/Pantomime/Bundles/SSL USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes -LOCALLIBDIR= ${PREFIX}/Local/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu -USE_GCC= 3.2 .include <bsd.port.pre.mk> .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +PANTOMIME_PORT?= mail/pantomime .include <bsd.port.post.mk> diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile index bfa01a125d89..6acd3ab101f2 100644 --- a/mail/pantomime/Makefile +++ b/mail/pantomime/Makefile @@ -16,35 +16,18 @@ DISTNAME= Pantomime-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= Mail/MIME handling library for GNUstep -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/Pantomime USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes -USE_GCC= 3.2 - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile index e7ca22cf63e1..4df6bbfc7933 100644 --- a/misc/gnustep-examples/Makefile +++ b/misc/gnustep-examples/Makefile @@ -15,45 +15,33 @@ MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep example applications -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/${DISTNAME} GUN_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu MAKE_APPS= Finger GFractal GPuzzle HostAddress INSTALL_APPS= Finger GFractal GPuzzle HostAddress .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +post-build: .for i in ${MAKE_APPS} - @(cd ${WRKSRC}/gui/${i}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ + @(cd ${WRKSRC}/gui/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) .endfor -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +post-install: .for i in ${INSTALL_APPS} - @(cd ${WRKSRC}/gui/${i}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ + @(cd ${WRKSRC}/gui/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .endfor diff --git a/shells/gscommander/Makefile b/shells/gscommander/Makefile index 40636450bc90..6df037986b66 100644 --- a/shells/gscommander/Makefile +++ b/shells/gscommander/Makefile @@ -14,36 +14,19 @@ DISTNAME= GSCommander-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep simple unix command monitor -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/GSCommander GUN_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile index 2ba9420f56da..c1f1e576434d 100644 --- a/textproc/easydiff/Makefile +++ b/textproc/easydiff/Makefile @@ -15,36 +15,19 @@ DISTNAME= EasyDiff-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep graphical diff -BUILD_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes WRKSRC= ${WRKDIR}/EasyDiff GUN_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= -NO_MTREE= yes - -BACKBUNDLEDIR= ${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index ba60e6eead1d..7d40badb1658 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -15,43 +15,30 @@ MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep GUI library -BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall -RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile -BREAKS_IF_PEDANTIC= yes -USE_GCC= 3.2 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 300000 -BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x" -.endif - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= -USE_GMAKE= yes -MAKEFILE= -MAKE_FLAGS+= OPTFLAG="${CFLAGS}" -NO_MTREE= yes CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include +USE_GMAKE= yes +MAKEFILE= +MAKE_FLAGS+= OPTFLAG="${CFLAGS}" +BREAKS_IF_PEDANTIC= yes EXTRA_FIX= ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss/Makefile -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \ - MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} +.include <bsd.port.pre.mk> -COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +USE_GNUSTEP_BASE= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" post-extract: .for file in config.guess config.sub install-sh @@ -64,29 +51,6 @@ pre-configure: -e "s;-Wall;-Wall ${PTHREAD_CFLAGS:S=""==};" \ ${EXTRA_FIX}.sed > ${EXTRA_FIX} -do-configure: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL} -c" \ - INSTALL_PROGRAM="${INSTALL} -c" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ - ${CAT} ${CONFIGURE_LOG}; \ - ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ - ${FALSE}; \ - fi) - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) - test: @(cd ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss && \ ${GMAKE} && ./patest) diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile index 179187db8b11..db08d59c750b 100644 --- a/x11-toolkits/gtoolkit/Makefile +++ b/x11-toolkits/gtoolkit/Makefile @@ -14,18 +14,14 @@ MASTER_SITES= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/ MAINTAINER= dinoex@FreeBSD.org COMMENT= Obj-C wrapper for gtk, a x11 graphics library -BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base -RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base - PREFIX= ${LOCALBASE}/GNUstep +NO_MTREE= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes -NO_MTREE= yes -USE_GCC= 3.2 -MAKE_ARGS= GNUSTEP_SYSTEM_ROOT=${PREFIX}/System +MAKE_ARGS+= GNUSTEP_SYSTEM_ROOT=${PREFIX}/System CONFIGURE_ARGS+= --with-gnustep INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/GToolKit @@ -38,40 +34,12 @@ post-patch: > ${CONFIGURE_WRKSRC}/configure ${CHMOD} +x ${CONFIGURE_WRKSRC}/configure -do-configure: - @(cd ${CONFIGURE_WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL} -c" \ - INSTALL_PROGRAM="${INSTALL} -c" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ - ${CAT} ${CONFIGURE_LOG}; \ - ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ - ${FALSE}; \ - fi) - -do-build: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) - -do-install: - @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) - .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} - -SYSTEMDIR= ${PREFIX}/System -SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} -COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu +USE_GNUSTEP_BASE= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes +.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" .include <bsd.port.post.mk> |