Date: Fri, 27 Aug 1999 16:30:51 -0500 From: Ade Lovett <ade@lovett.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13423: unbreak devel/gnustep Message-ID: <E11KTaF-000KIZ-00@zen.lovett.com>
next in thread | raw e-mail | index | archive | help
>Number: 13423
>Category: ports
>Synopsis: unbreak devel/gnustep
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 27 14:40:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Ade Lovett
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Lovett Network Consultancy
>Environment:
Up to date ports tree.
>Description:
PLIST uses hardcoded FreeBSD version numbers.
>How-To-Repeat:
On anything but an i386 3.1 system :)
make install deinstall
>Fix:
Make use of the wonderful PLIST_SUB widget to DTRT.
Apply following patch. On deinstall, this still leaves
the top level directory floating around, but that's more
to do with the really *weird* hierarchy this port uses
Turning it into something more BSD-friendly is likely
to be a serious non-trivial job.
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/FreeBSD/cvs/ports/devel/gnustep/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 1999/08/17 19:36:55 1.4
+++ Makefile 1999/08/27 21:18:42
@@ -19,15 +19,19 @@
.include <bsd.port.pre.mk>
+USE_NEWGCC=yes
+
.if ${OSVERSION} < 300000
BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x"
-.elif ${OSVERSION} < 400000
-BUILD_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
-CC= gcc295
.endif
-BROKEN= "Hardcoded freebsd release numbers in PLIST"
+.if ${MACHINE_ARCH} == "i386"
+GNU_ARCH= ix86
+.else
+GNU_ARCH= ${MACHINE_ARCH}
+.endif
+GNU_HOST= freebsd${OSREL}
+PLIST_SUB= GNU_ARCH=${GNU_ARCH} GNU_HOST=${GNU_HOST}
WRKSRC= ${WRKDIR}/gstep-0.5.5
PREFIX= ${LOCALBASE}/GNUstep
@@ -43,15 +47,5 @@
MAKEFILE=
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
NO_MTREE= yes
-
-GNUSTEPLIBDIR= ${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
-
-post-install:
-.for lib in gmodel gnustep-base gnustep-gui gnustep-xraw
- ${LN} -sf ${GNUSTEPLIBDIR}/lib${lib}.so ${LOCALBASE}/lib/lib${lib}.so
- ${LN} -sf ${GNUSTEPLIBDIR}/lib${lib}.so.0.5.5 \
- ${LOCALBASE}/lib/lib${lib}.so.0.5.5
-.endfor
- ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${LOCALBASE}/lib
.include <bsd.port.post.mk>
cvs diff: Diffing files
cvs diff: Diffing patches
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /home/FreeBSD/cvs/ports/devel/gnustep/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST 1999/05/10 11:32:02 1.1.1.1
+++ PLIST 1999/08/27 21:15:51
@@ -265,8 +265,8 @@
Headers/gnustep/xraw/XRWindow.h
Headers/gnustep/xraw/XRWindowView.h
Headers/gnustep/xraw/stdxr.h
-Headers/ix86/freebsd3.1/GSConfig.h
-Headers/ix86/freebsd3.1/mframe.h
+Headers/%%GNU_ARCH%%/%%GNU_HOST%%/GSConfig.h
+Headers/%%GNU_ARCH%%/%%GNU_HOST%%/mframe.h
Libraries/Resources/Images/GNUstep_Images_Copyright
Libraries/Resources/Images/common_ArrowDown.tiff
Libraries/Resources/Images/common_ArrowDownH.tiff
@@ -805,33 +805,13 @@
Libraries/Resources/gnustep/NSTimeZones/zones/W-SU
Libraries/Resources/gnustep/NSTimeZones/zones/WET
Libraries/Resources/gnustep/NSTimeZones/zones/Zulu
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgmodel.so
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgmodel.so.0.5.5
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-base.so
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-base.so.0.5.5
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-gui.so
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-gui.so.0.5.5
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-xraw.so
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
-Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw/libgnustep-xraw.so.0.5.5
-@exec ln -sf %D/%F %D/../lib/%f
-@unexec rm -f %D/../lib/%f
+Libraries/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/libgmodel_s.a
+Libraries/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/libgnustep-base_s.a
+Libraries/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/libgnustep-gui_s.a
+Libraries/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/libgnustep-xraw_s.a
Library/Model/SavePanel.gmodel
Library/Services/example.service/Resources/Info-gnustep.plist
-Library/Services/example.service/ix86/freebsd3.1/gnu-gnu-gnu-xraw/example
+Library/Services/example.service/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/example
Makefiles/GNUstep.csh
Makefiles/GNUstep.sh
Makefiles/MediaBook.func
@@ -849,8 +829,8 @@
Makefiles/cpu.sh
Makefiles/documentation.make
Makefiles/install-sh
-Makefiles/ix86/freebsd3.1/config.make
-Makefiles/ix86/freebsd3.1/which_lib
+Makefiles/%%GNU_ARCH%%/%%GNU_HOST%%/config.make
+Makefiles/%%GNU_ARCH%%/%%GNU_HOST%%/which_lib
Makefiles/ld_lib_path.csh
Makefiles/ld_lib_path.sh
Makefiles/library.make
@@ -871,42 +851,42 @@
Makefiles/transform_paths.sh
Makefiles/vendor.sh
Tools/debugapp
-Tools/ix86/freebsd3.1/gdomap
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/defaults
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/dread
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/dremove
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/dwrite
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/gdnc
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/gpbs
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/make_services
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/plparse
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/set_show_service
-Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw/sfparse
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gdomap
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/defaults
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/dread
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/dremove
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/dwrite
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/gdnc
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/gpbs
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/make_services
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/plparse
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/set_show_service
+Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw/sfparse
Tools/openapp
Tools/opentool
share/config.site
@dirrm share
-@dirrm Tools/ix86/freebsd3.1/gnu-gnu-gnu-xraw
-@dirrm Tools/ix86/freebsd3.1
-@dirrm Tools/ix86
+@dirrm Tools/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw
+@dirrm Tools/%%GNU_ARCH%%/%%GNU_HOST%%
+@dirrm Tools/%%GNU_ARCH%%
@dirrm Tools
-@dirrm Makefiles/ix86/freebsd3.1
-@dirrm Makefiles/ix86
+@dirrm Makefiles/%%GNU_ARCH%%/%%GNU_HOST%%
+@dirrm Makefiles/%%GNU_ARCH%%
@dirrm Makefiles
@dirrm Library/man
@dirrm Library/info
-@dirrm Library/Services/example.service/ix86/freebsd3.1/gnu-gnu-gnu-xraw
-@dirrm Library/Services/example.service/ix86/freebsd3.1
-@dirrm Library/Services/example.service/ix86
+@dirrm Library/Services/example.service/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw
+@dirrm Library/Services/example.service/%%GNU_ARCH%%/%%GNU_HOST%%
+@dirrm Library/Services/example.service/%%GNU_ARCH%%
@dirrm Library/Services/example.service/Resources
@dirrm Library/Services/example.service
@dirrm Library/Services
@dirrm Library/PostScript
@dirrm Library/Model
@dirrm Library
-@dirrm Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
-@dirrm Libraries/ix86/freebsd3.1
-@dirrm Libraries/ix86
+@dirrm Libraries/%%GNU_ARCH%%/%%GNU_HOST%%/gnu-gnu-gnu-xraw
+@dirrm Libraries/%%GNU_ARCH%%/%%GNU_HOST%%
+@dirrm Libraries/%%GNU_ARCH%%
@dirrm Libraries/Resources/gnustep/NSTimeZones/zones/US
@dirrm Libraries/Resources/gnustep/NSTimeZones/zones/SystemV
@dirrm Libraries/Resources/gnustep/NSTimeZones/zones/Pacific
@@ -933,8 +913,8 @@
@dirrm Libraries/Resources/Images
@dirrm Libraries/Resources
@dirrm Libraries
-@dirrm Headers/ix86/freebsd3.1
-@dirrm Headers/ix86
+@dirrm Headers/%%GNU_ARCH%%/%%GNU_HOST%%
+@dirrm Headers/%%GNU_ARCH%%
@dirrm Headers/gnustep/xraw
@dirrm Headers/gnustep/unicode
@dirrm Headers/gnustep/gui/AppKit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E11KTaF-000KIZ-00>