diff options
-rw-r--r-- | deskutils/gworkspace/Makefile | 15 | ||||
-rw-r--r-- | deskutils/preferences.app/Makefile | 13 | ||||
-rw-r--r-- | devel/gnustep-make/Makefile | 7 | ||||
-rw-r--r-- | devel/gorm/Makefile | 11 | ||||
-rw-r--r-- | devel/projectcenter.app/Makefile | 13 | ||||
-rw-r--r-- | games/gomoku.app/Makefile | 9 | ||||
-rw-r--r-- | games/gshisen/Makefile | 10 | ||||
-rw-r--r-- | graphics/imageviewer/Makefile | 9 | ||||
-rw-r--r-- | lang/gnustep-base/Makefile | 9 | ||||
-rw-r--r-- | lang/gnustep-guile/Makefile | 9 | ||||
-rw-r--r-- | mail/gnumail/Makefile | 9 | ||||
-rw-r--r-- | mail/pantomime-ssl/Makefile | 12 | ||||
-rw-r--r-- | mail/pantomime/Makefile | 13 | ||||
-rw-r--r-- | misc/gnustep-examples/Makefile | 13 | ||||
-rw-r--r-- | shells/gscommander/Makefile | 9 | ||||
-rw-r--r-- | textproc/easydiff/Makefile | 9 | ||||
-rw-r--r-- | x11-toolkits/gnustep-back/Makefile | 11 | ||||
-rw-r--r-- | x11-toolkits/gnustep-gui/Makefile | 15 | ||||
-rw-r--r-- | x11-toolkits/gtoolkit/Makefile | 15 |
19 files changed, 81 insertions, 130 deletions
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile index 11597af2cb8..0ba3035b10b 100644 --- a/deskutils/gworkspace/Makefile +++ b/deskutils/gworkspace/Makefile @@ -19,6 +19,11 @@ NO_MTREE= yes WRKSRC= ${WRKDIR}/GWorkspace-${PORTVERSION} GUN_CONFIGURE= yes USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= GNUmakefile .ifdef WITHOUT_GHOSTSCRIPT @@ -34,12 +39,4 @@ RUN_DEPENDS+= gs:${PORTSDIR}/${GSPORT} PLIST_SUB+= PDFVIEW="" .endif -.include <bsd.port.pre.mk> - -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> +.include <bsd.port.mk> diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile index 766c24f2154..7ea70bbf42d 100644 --- a/deskutils/preferences.app/Makefile +++ b/deskutils/preferences.app/Makefile @@ -20,6 +20,10 @@ USE_BZIP2= yes PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= GNUmakefile INSTALLS_SHLIB= yes @@ -33,11 +37,4 @@ post-patch: ${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i} .endfor -.include <bsd.port.pre.mk> - -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index b921ae2f6e0..f17b4774644 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -33,6 +33,7 @@ CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \ CFLAGS="${CFLAGS} -D_THREAD_SAFE" CONFIGURE_TARGET= USE_GMAKE= yes +USE_GNUSTEP= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" @@ -42,13 +43,9 @@ PLIST_SUB+= NOFLAT2="" PLIST_SUB+= NOFLAT2="${GNU_ARCH}/${OPSYS:L}/" .endif -.include <bsd.port.pre.mk> - -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - post-configure: ${MV} ${WRKSRC}/config.make ${WRKSRC}/config.make.sed ${SED} -e "s|\(objc_threaded:=\).*|\1 ${PTHREAD_LIBS}|" \ < ${WRKSRC}/config.make.sed > ${WRKSRC}/config.make -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile index abd020de13a..80d4668a99c 100644 --- a/devel/gorm/Makefile +++ b/devel/gorm/Makefile @@ -19,15 +19,12 @@ COMMENT= Graphical Object Relationship Modeller PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes USE_GMAKE= yes -MAKEFILE= -ALL_TARGET= - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= +ALL_TARGET= .if defined(WITH_GNUSTEP_DEVEL) PLIST_SUB+= PALETTES=System/Applications/Gorm.app/Resources @@ -35,4 +32,4 @@ PLIST_SUB+= PALETTES=System/Applications/Gorm.app/Resources PLIST_SUB+= PALETTES=System/Developer/Palettes .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile index 24f9598a660..803697d5508 100644 --- a/devel/projectcenter.app/Makefile +++ b/devel/projectcenter.app/Makefile @@ -20,6 +20,10 @@ PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes WRKSRC= ${WRKDIR}/ProjectCenter USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= GNUmakefile MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS="-I${WRKSRC}" MAKE_ENV+= ADDITIONAL_LIB_DIRS="-L${WRKSRC}/PCLib/shared_obj/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu" @@ -27,13 +31,6 @@ MAKE_ENV+= ADDITIONAL_LIB_DIRS="-L${WRKSRC}/PCLib/shared_obj/${GNU_ARCH}/${OPSYS FIXME= GNUmakefile.bundles GNUmakefile.preamble \ PCLib/GNUmakefile.preamble -.include <bsd.port.pre.mk> - -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - # Quick workaround until I find out how to set the real path in the code post-patch: .for file in PCLib/PCBundleLoader.m PCAppController.m @@ -47,4 +44,4 @@ post-patch: ${WRKSRC}/${file}.sed > ${WRKSRC}/${file} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/gomoku.app/Makefile b/games/gomoku.app/Makefile index fb7cc49d29b..df1addbb23e 100644 --- a/games/gomoku.app/Makefile +++ b/games/gomoku.app/Makefile @@ -18,13 +18,10 @@ COMMENT= GNUstep Gomoku game PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes USE_GMAKE= yes -MAKEFILE= GNUmakefile - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile index b1eb6fe0efe..cf4f60ee737 100644 --- a/games/gshisen/Makefile +++ b/games/gshisen/Makefile @@ -18,14 +18,10 @@ PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes WRKSRC= ${WRKDIR}/GShisen USE_GMAKE= yes -MAKEFILE= -MAKE_FLAGS= GUI_BACKEND_LIB=back - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile index 2d3ba2e9033..2ac0b535cb9 100644 --- a/graphics/imageviewer/Makefile +++ b/graphics/imageviewer/Makefile @@ -21,13 +21,10 @@ NO_MTREE= yes WRKSRC= ${WRKDIR}/ImageViewer GUN_CONFIGURE= yes USE_GMAKE= yes -MAKEFILE= GNUmakefile - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index 4b287d7d763..54f3c32d1fd 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -31,6 +31,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs CONFIGURE_TARGET= USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml @@ -40,11 +44,6 @@ PLIST_SUB+= LOCALBASE=${LOCALBASE} .include <bsd.port.pre.mk> -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_OBJC_PORT} && make -V TARGLIB) post-extract: diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile index 8ce21ae0c1e..41658ed2161 100644 --- a/lang/gnustep-guile/Makefile +++ b/lang/gnustep-guile/Makefile @@ -22,6 +22,10 @@ NO_MTREE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" PLIST_SUB+= GUILE_VER="${GUILE_VER}" @@ -40,11 +44,6 @@ PLIST_SUB+= USEX11="" .include <bsd.port.pre.mk> -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - GUILE_VER!= (cd ${PORTSDIR}/lang/guile && make -V GUILE_VER) pre-configure: diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile index 85d13dc87cf..0dbed98be70 100644 --- a/mail/gnumail/Makefile +++ b/mail/gnumail/Makefile @@ -23,16 +23,15 @@ PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes WRKSRC= ${WRKDIR}/GNUMail USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= ALL_TARGET= .include <bsd.port.pre.mk> -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - PANTOMIME_PORT?= mail/pantomime .include <bsd.port.post.mk> diff --git a/mail/pantomime-ssl/Makefile b/mail/pantomime-ssl/Makefile index 9acdb02b7ea..dbd05561076 100644 --- a/mail/pantomime-ssl/Makefile +++ b/mail/pantomime-ssl/Makefile @@ -23,17 +23,15 @@ RUN_DEPENDS+= ${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/${PANTOMIME_PORT} PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes WRKSRC= ${WRKDIR}/Pantomime/Bundles/SSL +USE_OPENSSL= yes USE_GMAKE= yes -MAKEFILE= GNUmakefile - -.include <bsd.port.pre.mk> - -.include "${PORTSDIR}/security/openssl/bsd.openssl.mk" - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile + +.include <bsd.port.pre.mk> PANTOMIME_PORT?= mail/pantomime diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile index 293e232383d..a9cfe58c2f5 100644 --- a/mail/pantomime/Makefile +++ b/mail/pantomime/Makefile @@ -20,15 +20,12 @@ PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes WRKSRC= ${WRKDIR}/Pantomime USE_GMAKE= yes -MAKEFILE= GNUmakefile -LDCONFIG_DIRS= ${LOCALLIBDIR} -INSTALLS_SHLIB= yes - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile +LDCONFIG_DIRS= ${LOCALLIBDIR} +INSTALLS_SHLIB= yes -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile index efd40cbb95e..abeea7aab32 100644 --- a/misc/gnustep-examples/Makefile +++ b/misc/gnustep-examples/Makefile @@ -20,18 +20,15 @@ NO_MTREE= yes WRKSRC= ${WRKDIR}/${DISTNAME} GUN_CONFIGURE= yes USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_BACK= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= GNUmakefile MAKE_APPS= Finger GFractal GPuzzle HostAddress INSTALL_APPS= Finger GFractal GPuzzle HostAddress -.include <bsd.port.pre.mk> - -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - post-build: .for i in ${MAKE_APPS} @(cd ${WRKSRC}/gui/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ @@ -47,4 +44,4 @@ post-install: rm -rf /root/GNUstep .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/shells/gscommander/Makefile b/shells/gscommander/Makefile index d211b75d905..ac7bd26f153 100644 --- a/shells/gscommander/Makefile +++ b/shells/gscommander/Makefile @@ -19,13 +19,10 @@ NO_MTREE= yes WRKSRC= ${WRKDIR}/GSCommander GUN_CONFIGURE= yes USE_GMAKE= yes -MAKEFILE= GNUmakefile - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile index 087b2db4ac7..fa80b031f91 100644 --- a/textproc/easydiff/Makefile +++ b/textproc/easydiff/Makefile @@ -20,13 +20,10 @@ NO_MTREE= yes WRKSRC= ${WRKDIR}/EasyDiff GUN_CONFIGURE= yes USE_GMAKE= yes -MAKEFILE= GNUmakefile - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= GNUmakefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index 1ac2b86f3ea..074107dad0f 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -36,6 +36,11 @@ CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include #CPPFLAGS+= -I${LOCALBASE}/include/freetype2 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" USE_GMAKE= yes +USE_GNUSTEP= yes +USE_GNUSTEP_GUI= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes MAKEFILE= MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${X11BASE}/include" BREAKS_IF_PEDANTIC= yes @@ -68,12 +73,6 @@ PLIST_SUB+= USE_XLIB="" USE_XDPS="@comment " USE_ART="@comment " MAKE_ENV+= ADDITIONAL_LDFLAGS=-lcipher .endif -USE_GNUSTEP_GUI= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" - post-extract: .for file in config.guess config.sub install-sh @${CP} ${PREFIX}/System/Makefiles/${file} ${WRKSRC} diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index a9eb6fe2361..bb1f4522726 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -31,18 +31,15 @@ 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 - -.include <bsd.port.pre.mk> - +USE_GNUSTEP= yes USE_GNUSTEP_CONFIGURE= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes USE_GNUSTEP_BASE= yes -.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk" +MAKEFILE= +MAKE_FLAGS+= OPTFLAG="${CFLAGS}" +BREAKS_IF_PEDANTIC= yes +EXTRA_FIX= ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss/Makefile post-extract: .for file in config.guess config.sub install-sh @@ -59,4 +56,4 @@ test: @(cd ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss && \ ${GMAKE} && ./patest) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile index a9c5c76b9a7..7bd074563aa 100644 --- a/x11-toolkits/gtoolkit/Makefile +++ b/x11-toolkits/gtoolkit/Makefile @@ -18,6 +18,11 @@ PREFIX= ${LOCALBASE}/GNUstep NO_MTREE= yes USE_GMAKE= yes USE_GNOME= gtk12 +USE_GNUSTEP= yes +USE_GNUSTEP_BASE= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes GNU_CONFIGURE= yes LDCONFIG_DIRS= ${LOCALLIBDIR} INSTALLS_SHLIB= yes @@ -34,12 +39,4 @@ post-patch: > ${CONFIGURE_WRKSRC}/configure ${CHMOD} +x ${CONFIGURE_WRKSRC}/configure -.include <bsd.port.pre.mk> - -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> +.include <bsd.port.mk> |