cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't set soname for libs

Browse Source 
- Use devel/gettext MODULE
- Add WANTLIB markers
- Bump PKGNAME

go ahead brad@
This commit is contained in:
alek 2005-01-25 17:19:33 +00:00
parent 701498dd1b
commit 32a808351c
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/ghostscript/afpl/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2005/01/24 16:00:14 brad Exp $
# $OpenBSD: Makefile,v 1.27 2005/01/25 17:19:33 alek Exp $
COMMENT= "AFPL PostScript interpreter"
VERSION= 8.14
DISTNAME= ghostscript-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= print lang
DIR= AFPL/gs${VERSION:S/.//}
@ -24,6 +24,7 @@ PERMIT_DISTFILES_CDROM= "Aladdin wants fee for commercial redistribution"
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= "Aladdin wants fee for commercial redistribution"
PERMIT_PACKAGE_FTP= Yes
WANTLIB= c m z pthread
JPEGDIR=graphics/jpeg
@ -107,7 +108,9 @@ CFLAGS+= -DA4
.if ${FLAVOR:L:Mgtk} && ${FLAVOR:L:Mno_x11}
ERRORS+= "Fatal: Conflicting flavors: ${FLAVOR}"
.elif ${FLAVOR:L:Mgtk}
MODULES= devel/gettext
LIB_DEPENDS+= gtk.1,gdk::x11/gtk+
WANTLIB+= Xi glib gmodule
ALL_TARGET+=so
INSTALL_TARGET+=soinstall
NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
@ -117,6 +120,7 @@ end_install=
.if !${FLAVOR:L:Mno_x11}
USE_X11= Yes
WANTLIB+= X11 Xt SM ICE Xext
BASE_FLAGS+= DEVICE_DEVS1='${X11_DEVICE_DEVS1} ${BASE_DEVICE_DEVS1}'
.else
BASE_FLAGS+= DEVICE_DEVS1='${BASE_DEVICE_DEVS1}'

13
print/ghostscript/afpl/patches/patch-src_unix-dll_mak
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_unix-dll_mak,v 1.3 2004/05/23 18:54:01 sturm Exp $
--- src/unix-dll.mak.orig 2004-05-23 18:45:08.000000000 +0200
+++ src/unix-dll.mak 2004-05-23 18:56:50.000000000 +0200
@@ -70,7 +70,7 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
$OpenBSD: patch-src_unix-dll_mak,v 1.4 2005/01/25 17:19:33 alek Exp $
--- src/unix-dll.mak.orig Fri Dec 12 23:08:05 2003
+++ src/unix-dll.mak Tue Jan 25 13:30:49 2005
@@ -70,11 +70,11 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
$(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
@ -10,3 +10,8 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.3 2004/05/23 18:54:01 sturm Exp $
# ------------------------- Recursive make targets ------------------------- #
-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\
+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared'\
GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
STDIO_IMPLEMENTATION=c\
DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\

8
print/ghostscript/gnu/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.40 2005/01/24 16:00:14 brad Exp $
# $OpenBSD: Makefile,v 1.41 2005/01/25 17:19:33 alek Exp $
COMMENT= "GNU PostScript interpreter"
VERSION= 7.05
DISTNAME= ghostscript-${VERSION}
PKGNAME= ${DISTNAME}p4
PKGNAME= ${DISTNAME}p5
CATEGORIES= print lang
DIR= gnu/gs${VERSION:S/.//}
@ -23,6 +23,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= m c z pthread
JPEGDIR=graphics/jpeg
@ -107,7 +108,9 @@ CFLAGS+= -DA4
.if ${FLAVOR:L:Mgtk} && ${FLAVOR:L:Mno_x11}
ERRORS+= "Fatal: Conflicting flavors: ${FLAVOR}"
.elif ${FLAVOR:L:Mgtk}
MODULES= devel/gettext
LIB_DEPENDS+= gtk.1,gdk::x11/gtk+
WANTLIB+= Xi glib gmodule
ALL_TARGET+=so
INSTALL_TARGET+=soinstall
NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
@ -119,6 +122,7 @@ end_install=
.if !${FLAVOR:L:Mno_x11}
USE_X11= Yes
BASE_FLAGS+= DEVICE_DEVS1='${X11_DEVICE_DEVS1} ${BASE_DEVICE_DEVS1}'
WANTLIB+= X11 Xt SM Xext ICE
.else
BASE_FLAGS+= DEVICE_DEVS1='${BASE_DEVICE_DEVS1}'
.endif

13
print/ghostscript/gnu/patches/patch-src_unix-dll_mak
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_unix-dll_mak,v 1.1 2002/12/03 13:17:07 espie Exp $
--- src/unix-dll.mak.orig Tue Dec 3 13:25:33 2002
+++ src/unix-dll.mak Tue Dec 3 13:37:36 2002
@@ -70,7 +70,7 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
$OpenBSD: patch-src_unix-dll_mak,v 1.2 2005/01/25 17:19:33 alek Exp $
--- src/unix-dll.mak.orig Fri Apr 19 03:10:40 2002
+++ src/unix-dll.mak Tue Jan 25 12:19:16 2005
@@ -70,11 +70,11 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
$(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
@ -10,3 +10,8 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.1 2002/12/03 13:17:07 espie Exp $
# ------------------------- Recursive make targets ------------------------- #
-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared '\
GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
STDIO_IMPLEMENTATION=c\
DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\