Date: Tue, 7 Dec 1999 07:31:58 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15334: Update port: audio/gsm Message-ID: <19991207153158.5A069153EC@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15334
>Category: ports
>Synopsis: Update port: audio/gsm
>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: Tue Dec 7 07:40:02 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.3-RELEASE i386
>Organization:
>Environment:
>Description:
* Modified patches to support INSTALL_MACROS instead of cp/mv command
* Fixed behavior of installing man pages
* Added WWW: line into pkg/DESCR
* Fixed pkg/PLIST
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/gsm/patches/patch-ab audio/gsm/patches/patch-ab
--- /usr/ports/audio/gsm/patches/patch-ab Tue Sep 22 22:26:00 1998
+++ audio/gsm/patches/patch-ab Tue Dec 7 00:20:39 1999
@@ -1,5 +1,5 @@
-*** Makefile.orig Tue Jul 2 09:36:06 1996
---- Makefile Tue Sep 22 12:40:53 1998
+*** Makefile.orig Tue Jul 2 23:36:06 1996
+--- Makefile Tue Dec 7 00:06:25 1999
***************
*** 7,17 ****
SASR = -DSASR
@@ -206,7 +206,7 @@
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
***************
-*** 299,321 ****
+*** 299,322 ****
# The basic API: libgsm
@@ -223,14 +223,15 @@
$(UNTOAST): $(BIN) $(TOAST)
! -rm $(RMFLAGS) $(UNTOAST)
- $(LN) $(TOAST) $(UNTOAST)
+! $(LN) $(TOAST) $(UNTOAST)
$(TCAT): $(BIN) $(TOAST)
! -rm $(RMFLAGS) $(TCAT)
- $(LN) $(TOAST) $(TCAT)
+! $(LN) $(TOAST) $(TCAT)
---- 314,344 ----
+ # The local bin and lib directories
+--- 314,345 ----
# The basic API: libgsm
@@ -240,7 +241,7 @@
! .else
! ld -Bshareable -o $@ $(GSM_OBJECTS:S/o$/so/g)
! .endif
-! (cd $(LIB); ln -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
+! (cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
!
! $(LIB)/$(LIBGSM): $(LIB) $(GSM_OBJECTS)
! $(RM) $(RMFLAGS) $(LIBGSM)
@@ -255,13 +256,14 @@
$(UNTOAST): $(BIN) $(TOAST)
! $(RM) $(RMFLAGS) $(UNTOAST)
- $(LN) $(TOAST) $(UNTOAST)
+! $(LN) -sf $(TOAST) $(UNTOAST)
$(TCAT): $(BIN) $(TOAST)
! $(RM) $(RMFLAGS) $(TCAT)
- $(LN) $(TOAST) $(TCAT)
+! $(LN) -sf $(TOAST) $(TCAT)
+ # The local bin and lib directories
***************
*** 342,403 ****
@@ -277,56 +279,56 @@
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
! -rm $@
- cp $(TOAST) $@
- chmod 755 $@
+! cp $(TOAST) $@
+! chmod 755 $@
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
! -rm $@
- ln $? $@
+! ln $? $@
$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
! -rm $@
- ln $? $@
+! ln $? $@
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
! -rm $@
- cp $? $@
- chmod 444 $@
-
+! cp $? $@
+! chmod 444 $@
+!
! $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
! -rm $@
- cp $? $@
- chmod 444 $@
+! cp $? $@
+! chmod 444 $@
# Distribution
---- 365,432 ----
+--- 365,431 ----
gsmuninstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
@@ -340,92 +342,57 @@
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
! $(RM) $@
- cp $(TOAST) $@
- chmod 755 $@
+! ${BSD_INSTALL_PROGRAM} $(TOAST) $@
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
! $(RM) $@
- ln $? $@
+! $(LN) -sf toast $@
$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
! $(RM) $@
- ln $? $@
+! $(LN) -sf toast $@
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
! $(RM) $@
- cp $? $@
- chmod 444 $@
+! ${BSD_INSTALL_MAN} $? $@
+!
+! $(TOAST_INSTALL_MAN)/untoast.1: $(MAN)/toast.1
+! $(RM) $@
+! $(LN) -sf toast.1 $@
+!
+! $(TOAST_INSTALL_MAN)/tcat.1: $(MAN)/toast.1
+! $(RM) $@
+! $(LN) -sf toast.1 $@
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
! $(RM) $@
- cp $? $@
- chmod 444 $@
+! ${BSD_INSTALL_MAN} $? $@
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
! $(RM) $@
- cp $? $@
- chmod 444 $@
+! ${BSD_INSTALL_MAN} $? $@
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
! $(RM) $@
- cp $? $@
- chmod 444 $@
+! ${BSD_INSTALL_MAN} $? $@
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
! $(RM) $@
- cp $? $@
- chmod 444 $@
+! ${BSD_INSTALL_MAN} $? $@
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
! $(RM) $@
- cp $? $@
- chmod 444 $@
-
-! $(GSM_INSTALL_LIB)/$(LIBGSM): $(LIB)/$(LIBGSM)
-! $(RM) $@
- cp $? $@
- chmod 444 $@
-+ ranlib $@
+! ${BSD_INSTALL_DATA} $? $@
++ $(GSM_INSTALL_LIB)/$(LIBGSM): $(LIB)/$(LIBGSM)
++ $(RM) $@
++ ${BSD_INSTALL_DATA} $? $@
++ $(RANLIB) $@
++
+ $(GSM_INSTALL_LIB)/$(SOLIBGSM): $(LIB)/$(SOLIBGSM)
+ $(RM) $@
-+ cp $? $@
-+ chmod 444 $@
-+ (cd ${PREFIX}/lib;ln -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
++ ${BSD_INSTALL_DATA} $? $@
++ (cd $(GSM_INSTALL_LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
# Distribution
-
-***************
-*** 416,422 ****
- @-echo uninstall: Done.
-
- semi-clean:
-! -rm $(RMFLAGS) */*.o \
- $(TST)/lin2cod $(TST)/lin2txt \
- $(TST)/cod2lin $(TST)/cod2txt \
- $(TST)/gsm2cod \
---- 445,451 ----
- @-echo uninstall: Done.
-
- semi-clean:
-! $(RM) $(RMFLAGS) */*.o \
- $(TST)/lin2cod $(TST)/lin2txt \
- $(TST)/cod2lin $(TST)/cod2txt \
- $(TST)/gsm2cod \
-***************
-*** 425,431 ****
- -print | xargs rm $(RMFLAGS)
-
- clean: semi-clean
-! -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
- $(TOAST) $(TCAT) $(UNTOAST) \
- $(ROOT)/gsm-1.0.tar.Z
-
---- 454,460 ----
- -print | xargs rm $(RMFLAGS)
-
- clean: semi-clean
-! $(RM) $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
- $(TOAST) $(TCAT) $(UNTOAST) \
- $(ROOT)/gsm-1.0.tar.Z
diff -urN /usr/ports/audio/gsm/pkg/DESCR audio/gsm/pkg/DESCR
--- /usr/ports/audio/gsm/pkg/DESCR Fri Jan 6 00:00:00 1995
+++ audio/gsm/pkg/DESCR Mon Dec 6 23:19:21 1999
@@ -1,2 +1,4 @@
gsm is a conversion package and library for converting u-law audio to
gsm encoding (which is much more efficient) and back again.
+
+WWW: http://kbs.cs.tu-berlin.de/~jutta/toast.html
diff -urN /usr/ports/audio/gsm/pkg/PLIST audio/gsm/pkg/PLIST
--- /usr/ports/audio/gsm/pkg/PLIST Tue Sep 22 22:26:00 1998
+++ audio/gsm/pkg/PLIST Mon Dec 6 23:38:32 1999
@@ -1,11 +1,11 @@
bin/toast
-@exec ln -f %D/%F %B/untoast
-@exec ln -f %D/%F %B/tcat
-@unexec rm %D/bin/untoast
+@exec ln -sf %F %B/tcat
+@exec ln -sf %F %B/untoast
@unexec rm %D/bin/tcat
-lib/libgsm.so.1.1
+@unexec rm %D/bin/untoast
+include/gsm.h
+lib/libgsm.a
lib/libgsm.so
+lib/libgsm.so.1
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-lib/libgsm.a
-include/gsm.h
>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?19991207153158.5A069153EC>