ports/50479: Request for approval to commit bsd.gnustep.mk
dirk.meyer at dinoex.sub.org
dirk.meyer at dinoex.sub.org
Mon Mar 31 12:20:16 UTC 2003
>Number: 50479
>Category: ports
>Synopsis: Request for approval to commit bsd.gnustep.mk
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 31 04:20:08 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 4.8-PRERELEASE i386
>Organization:
privat
>Environment:
FreeBSD ports
>Description:
common include to strip common defines and targes from ports:
ports/deskutils/gworkspace
ports/deskutils/preferences.app
ports/devel/gnustep
ports/devel/gnustep-make
ports/devel/gorm
ports/devel/projectcenter.app
ports/games/gshisen
ports/games/gomoku.app
ports/graphics/imageviewer
ports/lang/gnustep-base
ports/lang/gnustep-guile
ports/mail/pantomime
ports/mail/pantomime-ssl
ports/mail/gnumail
ports/misc/gnustep-examples
ports/textproc/easydiff
ports/shells/gscommander
ports/x11-toolkits/gnustep-gui
ports/x11-toolkits/gnustep-back
ports/x11-toolkits/gnustep-xdps
ports/x11-toolkits/gnustep-art
ports/x11-toolkits/gtoolkit
>How-To-Repeat:
Bytes 2251, /usr/ports/deskutils/gworkspace/Makefile
Bytes 987, /usr/ports/current/gworkspace/Makefile
-1264
Bytes 1768, /usr/ports/deskutils/preferences.app/Makefile
Bytes 1086, /usr/ports/current/preferences.app/Makefile
-682
Bytes 1313, /usr/ports/devel/gnustep/Makefile
Bytes 1297, /usr/ports/current/gnustep/Makefile
-16
Bytes 1334, /usr/ports/devel/gnustep-make/Makefile
Bytes 1111, /usr/ports/current/gnustep-make/Makefile
-223
Bytes 1480, /usr/ports/devel/gorm/Makefile
Bytes 741, /usr/ports/current/gorm/Makefile
-739
Bytes 2117, /usr/ports/devel/projectcenter.app/Makefile
Bytes 1419, /usr/ports/current/projectcenter.app/Makefile
-698
Bytes 1466, /usr/ports/games/gshisen/Makefile
Bytes 783, /usr/ports/current/gshisen/Makefile
-683
Bytes 1406, /usr/ports/games/gomoku.app/Makefile
Bytes 723, /usr/ports/current/gomoku.app/Makefile
-683
Bytes 1414, /usr/ports/graphics/imageviewer/Makefile
Bytes 744, /usr/ports/current/imageviewer/Makefile
-670
Bytes 2935, /usr/ports/lang/gnustep-base/Makefile
Bytes 1574, /usr/ports/current/gnustep-base/Makefile
-1361
Bytes 2258, /usr/ports/lang/gnustep-guile/Makefile
Bytes 1053, /usr/ports/current/gnustep-guile/Makefile
-1205
Bytes 1445, /usr/ports/mail/pantomime/Makefile
Bytes 834, /usr/ports/current/pantomime/Makefile
-611
Bytes 1452, /usr/ports/mail/pantomime-ssl/Makefile
Bytes 1084, /usr/ports/current/pantomime-ssl/Makefile
-368
Bytes 1732, /usr/ports/mail/gnumail/Makefile
Bytes 981, /usr/ports/current/gnumail/Makefile
-751
Bytes 1914, /usr/ports/misc/gnustep-examples/Makefile
Bytes 1247, /usr/ports/current/gnustep-examples/Makefile
-667
Bytes 1474, /usr/ports/textproc/easydiff/Makefile
Bytes 804, /usr/ports/current/easydiff/Makefile
-670
Bytes 1423, /usr/ports/shells/gscommander/Makefile
Bytes 753, /usr/ports/current/gscommander/Makefile
-670
Bytes 3047, /usr/ports/x11-toolkits/gnustep-gui/Makefile
Bytes 1650, /usr/ports/current/gnustep-gui/Makefile
-1397
Bytes 2741, /usr/ports/x11-toolkits/gnustep-back/Makefile
Bytes 2086, /usr/ports/current/gnustep-back/Makefile
-655
Bytes 2445, /usr/ports/x11-toolkits/gtoolkit/Makefile
Bytes 1206, /usr/ports/current/gtoolkit/Makefile
-1239
Total -15252 saving in bytes.
>Fix:
approve the committ:
Index: bsd.gnustep.mk
===================================================================
RCS file: bsd.gnustep.mk
diff -N bsd.gnustep.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ bsd.gnustep.mk 31 Mar 2003 11:50:33 -0000
@@ -0,0 +1,185 @@
+#
+# $FreeBSD$
+#
+# This file contains some variable definitions that are supposed to
+# make your life easier when dealing with ports related to the GNUstep.
+#
+#
+# Options for user to customize in /etc/make.conf:
+# ================================================
+#
+# WANT_GNUSTEP_XDPS=yes
+# use xdps as backend instead of xlib.
+#
+# WANT_GNUSTEP_LIBART=yes
+# use libart as backend instead of xlib.
+#
+#
+# Options for a port before include this file:
+# ============================================
+#
+# USE_GNUSTEP_BASE=yes
+# your port depends on the gnustep-base port.
+#
+# USE_GNUSTEP_GUI=yes
+# your port depends on the gnustep-gui port.
+#
+# USE_GNUSTEP_BACK=yes
+# your port depends on teh gnustep-back port.
+#
+# USE_GNUSTEP_CONFIGURE=yes
+# call configure script with GNUstep.sh sourced in the current shell
+#
+# USE_GNUSTEP_BUILD=yes
+# call build target with GNUstep.sh sourced in the current shell
+#
+# USE_GNUSTEP_INSTALL=yes
+# call install target with GNUstep.sh sourced in the current shell
+#
+
+# ---------------------------------------------------------------------------
+.if !defined(_POSTMKINCLUDED)
+
+GNUstep_Include_MAINTAINER= dinoex at FreeBSD.org
+
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
+LIB_DEPENDS+= objc:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
+
+GNUSTEP_MAKE_PORT?= devel/gnustep-make
+GNUSTEP_OBJC_PORT?= lang/gnustep-objc
+GNUSTEP_BASE_PORT?= lang/gnustep-base
+GNUSTEP_GUI_PORT?= x11-toolkits/gnustep-gui
+GNUSTEP_BACK_PORT?= x11-toolkits/gnustep-back
+GNUSTEP_XDPS_PORT?= x11-toolkits/gnustep-xdps
+GNUSTEP_ART_PORT?= x11-toolkits/gnustep-art
+
+.if ${MACHINE_ARCH} == "i386"
+GNU_ARCH= ix86
+.else
+GNU_ARCH= ${MACHINE_ARCH}
+.endif
+
+PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
+PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
+
+SYSTEMDIR= ${PREFIX}/System
+SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
+SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
+COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
+COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH}
+CC= gcc32
+CXX= g++32
+
+# ---------------------------------------------------------------------------
+# using base
+#
+.if defined(USE_GNUSTEP_BASE)
+BUILD_DEPENDS+= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
+RUN_DEPENDS+= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
+.endif
+
+# ---------------------------------------------------------------------------
+# using gui
+#
+.if defined(USE_GNUSTEP_GUI)
+BUILD_DEPENDS+= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
+RUN_DEPENDS+= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
+.endif
+
+# ---------------------------------------------------------------------------
+# using any backend
+#
+.if defined(USE_GNUSTEP_BACK)
+.if defined(WANT_GNUSTEP_XDPS)
+GNUSTEP_WITH_XDPS=yes
+.else
+.if defined(WANT_GNUSTEP_LIBART)
+USE_GNUSTEP_LIBART=yes
+.else
+USE_GNUSTEP_XLIB=yes
+.endif
+.endif
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using xlib
+#
+.if defined(USE_GNUSTEP_XLIB)
+BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+MAKE_FLAGS+= GUI_BACKEND_LIB=back
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using xdps
+#
+.if defined(USE_GNUSTEP_XDPS)
+BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
+MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
+.endif
+
+# ---------------------------------------------------------------------------
+# Backend using libart
+#
+.if defined(USE_GNUSTEP_LIBART)
+BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
+MAKE_FLAGS+= GUI_BACKEND_LIB=art
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_CONFIGURE)
+do-configure:
+ @(cd ${CONFIGURE_WRKSRC}; . ${SYSMAKEDIR}/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)
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_BUILD)
+BUILD_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+
+do-build:
+ @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+
+.endif
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+.if defined(USE_GNUSTEP_INSTALL)
+RUN_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+
+do-install:
+ @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+
+.endif
+
+.endif
+
+# eof
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.444
diff -u -r1.444 bsd.port.mk
--- bsd.port.mk 22 Mar 2003 04:45:24 -0000 1.444
+++ bsd.port.mk 31 Mar 2003 11:50:49 -0000
@@ -927,45 +927,7 @@
.endif # !defined(PERL_LEVEL) && defined(PERL_VERSION)
.if defined(USE_OPENSSL)
-.if ${OSVERSION} >= 400014
-.if !exists(/usr/lib/libcrypto.so)
-.BEGIN:
- @${ECHO_CMD} "This port requires the OpenSSL library, which is part of"
- @${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
- @${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
- @${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
- @${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
- @${ECHO_CMD} "OpenSSL distribution."
- @${FALSE}
-.else
-OPENSSLBASE= /usr
-OPENSSLDIR= /etc/ssl
-# OpenSSL in the base system may not include IDEA for patent licensing reasons.
-.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
-OPENSSL_IDEA= ${MAKE_IDEA}
-.else
-OPENSSL_IDEA?= NO
-.endif
-.if ${OPENSSL_IDEA} == "NO"
-# XXX This is a hack to work around the fact that /etc/make.conf clobbers
-# our CFLAGS. It might not be enough for all future ports.
-.if defined(HAS_CONFIGURE)
-CFLAGS+= -DNO_IDEA
-.else
-OPENSSL_CFLAGS+=-DNO_IDEA
-.endif
-MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
-.endif
-.endif
-.else
-LIB_DEPENDS+= crypto.2:${PORTSDIR}/security/openssl
-OPENSSLBASE?= ${LOCALBASE}
-OPENSSLDIR?= ${OPENSSLBASE}/openssl
-.endif
-OPENSSLLIB= ${OPENSSLBASE}/lib
-OPENSSLINC= ${OPENSSLBASE}/include
-MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
- OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
+.include "${PORTSDIR}/security/openssl/Makefile.ssl"
.endif
.if defined(EMACS_PORT_NAME)
@@ -3496,7 +3458,7 @@
else \
if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
- if [ -r "$${subpkgfile}" ]; then \
+ if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \
${PKG_ADD} $${subpkgfile}; \
else \
@@ -3550,7 +3512,17 @@
if [ ! -d "$$dir" ]; then \
${ECHO_MSG} " >> No directory for $$lib. Skipping.."; \
else \
- (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+ if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
+ subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
+ if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
+ ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \
+ ${PKG_ADD} $${subpkgfile}; \
+ else \
+ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+ fi; \
+ else \
+ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+ fi ; \
${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \
if ! ${LDCONFIG} -r | ${GREP} -qwE -e "-l$$pattern"; then \
${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list